Revert "Don't build gtk-launch when gio-unix is not available"

The gtk-launch tool can be build without gio-unix (although it
will not really do much without an alternative implementation for
g_desktop_app_info).

So there is no need to not build gtk-launch anymore.

This reverts commit 9a1235bf0dbdb1701779bec0ccae043cc4243ce5.

https://bugzilla.gnome.org/show_bug.cgi?id=682824

diff --git a/configure.ac b/configure.ac
index 882715049fdf096e1fb52dbf6236b7d5dfc7dfde..4a66b5051b28c77fb9e72196905e325e413d0b74 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1242,7 +1242,6 @@ if test "$have_gio_unix" = "yes"; then
 else
   GDK_GIO_PACKAGE=gio-2.0
 fi
-AM_CONDITIONAL(HAVE_GIO_UNIX, test "$have_gio_unix" = "yes")
 
 # Check for Pango flags
 

diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 6e7bbf1ae72cba5da78afdde4854a686b301a720..bfb0983ac6665c4af113ef964c06f5906ebfaaab 100644 (file)
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -1356,7 +1356,9 @@ endif
 #
 # Installed tools
 #
-bin_PROGRAMS = gtk-query-immodules-3.0
+bin_PROGRAMS = \
+       gtk-query-immodules-3.0 \
+       gtk-launch
 
 if BUILD_ICON_CACHE
 bin_PROGRAMS += gtk-update-icon-cache
@@ -1403,11 +1405,8 @@ gtk_update_icon_cache_LDADD = $(GDK_PIXBUF_LIBS)
 gtk_update_icon_cache_SOURCES = updateiconcache.c
 endif
 
-if HAVE_GIO_UNIX
-bin_PROGRAMS += gtk-launch
 gtk_launch_LDADD = $(LDADDS)
 gtk_launch_SOURCES = gtk-launch.c
-endif
 
 noinst_PROGRAMS = extract-strings